Skip to contentSkip to conversation

Change in openvpn[master]: test_user_pass: Fix building with --enable-systemd

Openvpn-devel In review flichtenheld (Code Review) 2 participants 8 messages Jun 4, 2024 – Jun 6, 2024 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1717505869000.Ic33c210f06e173a450534aa0969c57f140086655@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/641?usp=email

to review the following change.

Change subject: test_user_pass: Fix building with --enable-systemd
......................................................................

test_user_pass: Fix building with --enable-systemd

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id Ic33c210f06e173a450534aa0969c57f140086655

---
M tests/unit_tests/openvpn/test_user_pass.c

1 file changed, 2 insertions(+), 0 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/641/1

tests/unit_tests/openvpn/test_user_pass.c +2 -0
index ac84654..b43e655 100644
@@ -27,6 +27,8 @@
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/641?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Gerrit-Change-Number: 641
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/641?usp=email )

Change subject: test_user_pass: Fix building with --enable-systemd
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
Looks a bit hacky, but all of the test infra is :-) - and the buildbots agree that this works.

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/641?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Gerrit-Change-Number: 641
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 05 Jun 2024 11:06:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH 1/1 test_user_pass: Fix building with --enable-systemd

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id Ic33c210f06e173a450534aa0969c57f140086655

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/641
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>

tests/unit_tests/openvpn/test_user_pass.c +2 -0
index ac84654..b43e655 100644
@@ -27,6 +27,8 @@
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: test_user_pass: Fix building with --enable-systemd

Your patch has been applied to the master branch (this unit test is not in release/2.6, so nothing to fix there). Not tested myself as I do not have anything with systemd, but it does not break "non-systemd tests", as confirmed by gerrit/all the buildbots.

commit 7dfff75659e6c06abe500f5b8716d9712aa41bcc (master)

Author: Frank Lichtenheld
Date:   Wed Jun 5 13:10:12 2024 +0200
     test_user_pass: Fix building with --enable-systemd

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg28708.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/641?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

Change subject: test_user_pass: Fix building with --enable-systemd
......................................................................

test_user_pass: Fix building with --enable-systemd

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id Ic33c210f06e173a450534aa0969c57f140086655

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28708.html

---
M tests/unit_tests/openvpn/test_user_pass.c

1 file changed, 2 insertions(+), 0 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/641/2

tests/unit_tests/openvpn/test_user_pass.c +2 -0
index ac84654..b43e655 100644
@@ -27,6 +27,8 @@
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/641?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Gerrit-Change-Number: 641
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/641?usp=email )

Change subject: test_user_pass: Fix building with --enable-systemd
......................................................................

test_user_pass: Fix building with --enable-systemd

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id Ic33c210f06e173a450534aa0969c57f140086655

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28708.html

---
M tests/unit_tests/openvpn/test_user_pass.c

1 file changed, 2 insertions(+), 0 deletions(-)
tests/unit_tests/openvpn/test_user_pass.c +2 -0
index ac84654..b43e655 100644
@@ -27,6 +27,8 @@
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/641?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Gerrit-Change-Number: 641
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged

#7 lore raw
In reply to a message not in the archive

Attention is currently required from: cron2, its_Giaan, plaisthos.

its_Giaan has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/641?usp=email )

Change subject: test_user_pass: Fix building with --enable-systemd
......................................................................

test_user_pass: Fix building with --enable-systemd

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id Ic33c210f06e173a450534aa0969c57f140086655

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28708.html

---
M tests/unit_tests/openvpn/test_user_pass.c

1 file changed, 2 insertions(+), 0 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/641/2

tests/unit_tests/openvpn/test_user_pass.c +2 -0
index ac84654..b43e655 100644
@@ -27,6 +27,8 @@
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/641?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Gerrit-Change-Number: 641
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-MessageType: newpatchset

#8 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/641?usp=email )

Change subject: test_user_pass: Fix building with --enable-systemd
......................................................................

test_user_pass: Fix building with --enable-systemd

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id Ic33c210f06e173a450534aa0969c57f140086655

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28708.html

---
M tests/unit_tests/openvpn/test_user_pass.c

1 file changed, 2 insertions(+), 0 deletions(-)
tests/unit_tests/openvpn/test_user_pass.c +2 -0
index ac84654..b43e655 100644
@@ -27,6 +27,8 @@
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/641?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Gerrit-Change-Number: 641
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged